Merge "Bind-mount individual flattened APEXes" am: 028e1d4434
am: 79a93040e9

Change-Id: Ic51f7e86f71d780a9c71741f164b403f100f283a