Merge "Convert preload2 from .mk to .bp"
am: 90453ff9d9

Change-Id: Id4efcf47ae705b827e65cbc0e33c4c455e6c81ed