[automerger skipped] Merge "Merge "Add Android/data mounting along with obb...

[automerger skipped] Merge "Merge "Add Android/data mounting along with obb mounting in zygote" into rvc-dev am: bd04b1a7 am: 6fd65ded am: 77783815" into rvc-qpr-dev-plus-aosp am: 1d10906c -s ours
am skip reason: Change-Id Ie34f08d5764ca3f06577b2fb268c6cffe40f1b52 with SHA-1 e66d6098 is in history

Change-Id: I5feac908809d21a4c57f6517d80b3c0066e8004a