Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" am: 8a255aca am: abbcf546 Change-Id: I65f5927b59ebb4d8999fe4e31a10fd9bcd192063