Merge "Swap out Assist Library .mk files for .bp files."