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

Change-Id: Ie7f498a6ff96c516e6797b24f437c70cd7b170d5