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

Change-Id: I52322592a5ec00038dd00ca9df0d38324c770e2e