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

Change-Id: Ic572e341a55b5b57f10c8b7e936821000fcd3e46