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