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

Change-Id: I0c99299b107e7ab504de817059216216bfb9c7d8