Merge "Benchmark: Update AndroidTest.xml to push test vectors" am: 0479966c5f

Change-Id: I2f84a99e66d2087fdb6ecc22df162c9119156daa