Merge "Mount binderfs" am: b970633642 am: 545c380d43

Change-Id: If37098bf1f8ce910dfeb360fdb3e0801083039b7