Merge "Mount binderfs" am: 938379de5b am: 413bb44e3d

Change-Id: I78904a358295733f429f61b76592bde71221215a