Merge "benchmark: Add a build target that's not Android-dependent"
am: a845d07bbd

Change-Id: I681a857e3366bd6d61bd149c50ecdf9b3cbcf9a8