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

Change-Id: Idc71ee7f2694cb1cfc7ee69930cd6b60014cc1ea