Merge "For emulator builds preopt system apps even if doing eng build" am: 6dfd788fda am: cb3991d670
am: 178d8647e1

Change-Id: I3a0938d14708568f21cdc3eb7eeb6d741b24e570