Merge "Add android::fs_mgr namespace for new Fstab code" am: 54ea49ba05 am: 0bc62d5680
am: 0dec9106c3

Change-Id: I7fd5d3927dde907a7dbf8ad47325c3a9c5819d0d