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

Change-Id: Ie361d892076d22db11de2d39781453ccd327410d