Merge "emulator: support system as root" am: 303c8ef313
am: a71ff3ebaf

Change-Id: I50bf5f0b87b6f13e0ae20db5d361f5bb1fe76430