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

Change-Id: Ia3db47076a572b6904bbf316cedb9e08360aaa35