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

Change-Id: Ifaab3af435cca160897c56ba0ca1251726a50c53