Merge "emulator: support system-as-root" am: 44e363f1e3 am: 253dfc22a6
am: 5909b07cc4  -s ours

Change-Id: Ie2c45d04d7d179f754b4a9ca92b64081d68636dc