Merge "Add pre-upload check to enforce correct formatting of .bp files"
am: edd3e1c50c

Change-Id: I9e4a0b90546cbfea8d4da0dbd8dffcf4392aed89