Merge "benchmark: Add a build target that's not Android-dependent" am: a845d07b am: 7d909c4a am: 2f1a24fd am: d01317fa Change-Id: Ida47dda5c0c0cdbcc081c79a87e5dac6ce55fc05