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

Change-Id: I154d583fe0f905976bce4c69a09dd5d71a35518f