Merge "Revert "Remove option to create boot image based on preloaded classes"" am: a6c4ff2c am: c286a258 am: ec53d83a Change-Id: Ie464940fac4b3bfe196b82b8818e82322634b061