Merge "Add dexdiag_test"
am: ad70f8f997

Change-Id: Ib0b515f78bf12a1c8c2aaa2394b7c9bd2eae3181