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

Change-Id: I59c0ea2a08aa94bffa30e0403339edda9e417fa4