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

Change-Id: I08e254aa15e8b59d7ed52204f8accfbca4e5876b