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

Change-Id: I9abe9a9c0c5cca6bd625222f81b2c02aef576ec7