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

Change-Id: Ic3c074f2bdd3470e6258b1994b3f3e26d631b06e