Merge "Make bootjars work with OUT_DIR & friends" am: 7f34311c9c
am: dcbc5082ec

Change-Id: I531507a59a266ce24cd879b77f116873b005a73e