Merge "emulator: disable system-on-root and kernelBlob support" into qt-dev-plus-aosp
am: b2dc05d5f4

Change-Id: Ib3796407e1740e733490d526e2beda253f0f8e59