Merge "Create 'androidmk' rule to automatically run androidbp" into master-soong