Merge "Revert "Revert "Remove option to create boot image based on preloaded classes"""
am: 8a255acae2

Change-Id: Iaa48cb73170c43f36e2a6872599ebc703bf5b8ce