Merge "emulator: support system as root" am: 303c8ef313 am: a71ff3ebaf
am: 737f6c34e5  -s ours

Change-Id: I4628ed9adec29bd72e1c89ad9f33f9a429e36c8b