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

Change-Id: I5badbfee38017df25cffcf3b93b17107ec50344a