Merge remote-tracking branch 'aosp/master-soong'

Change-Id: Ie4d13a216466b2a8c193b6df05f360b7a59830e9