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