Merge "Add dexdiag_test" am: ad70f8f997 am: a2d4447e34 am: ff3eddcbff
am: d2a3190fb6

Change-Id: Ib58d86cd378479b9f424c1762cccf8c837130a12