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

Change-Id: I20226ef2c2bc51fb1334547db1ba813a84ac8c63