Merge "Replace custom rules with BUILD_PREBUILT" am: 5892520 am: f9afd3b6cb  -s ours
am: 2ba318792f

Change-Id: Ia26bc77da7181bf0a9b3a7706a5a3cf1f174458d