Merge 26be9872 on remote branch

build_and_run_benchmark.sh

jni/benchmark_jni.cpp

res/layout/controls.xml

res/values/strings.xml

results/generate_result.py

src/com/android/nn/benchmark/app/BenchmarkTestBase.java

src/com/android/nn/benchmark/app/NNBenchmark.java

src/com/android/nn/benchmark/app/NNControls.java

src/com/android/nn/benchmark/app/NNScoringTest.java

src/com/android/nn/benchmark/core/BenchmarkResult.java

src/com/android/nn/benchmark/core/NNTestBase.java