Merge "Fix flattened apex install dir" am: 9c32e3101e
am: f87c520193

Change-Id: I139d7e883e2c03f39cc492aa8251d9bec47b2c15