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

Change-Id: I18eae6295ef566ac7e886c3c68bc939bea0365ca