Merge "Do not mount the whole Android/data and Android/obb anymore" into rvc-dev am: 765276b8 am: 2994762f Change-Id: I7c8e330d993ecf6b2591b2c43f2b2b4ad2113783