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

[automerger skipped] Merge "Add Android/data mounting along with obb mounting in zygote" into rvc-dev am: bd04b1a7 am: 704b36b1 am: 1766b4e0 -s ours
am skip reason: Change-Id Ie34f08d5764ca3f06577b2fb268c6cffe40f1b52 with SHA-1 e66d6098 is in history

Change-Id: I199b909c0242f5475369f1de5b4e594b3f62f89a