Merge "Switch sdcardfs over to bind mounts." am: 94b9e4df04
am: 895cd44bd9

Change-Id: I33328d236f0ccfb9f65cfdc90d626a8561c032a1