Merge "Correctly gather boot jars from APEXes"
am: 7434764cce

Change-Id: I46f39494e352cfee375271244c744ab8ad7e539c