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

Change-Id: Ia606b5ad1a4e14316181c75f90afcd52fb60a16c