Merge "Do not mount the whole Android/data and Android/obb anymore" into rvc-dev am: 765276b8 am: 6f2658d5 Change-Id: I190605b6a41d5422601d0ee34e3b704663eefc90