Merge "Revert "Mount binderfs"" am: 823beae16a am: 146d595675

Change-Id: I13c3a172a4f6d9d2325ee4a6f1fd0f94550aede9