Merge "Add dexdiag_test" am: b629050b19 am: 22863ea6d6 am: e019bcf549
am: 5f315da056

Change-Id: Ia8df177063636679b2f06c7ff1fbc31bc698f22e