Merge "Convert preload2 from .mk to .bp"