Merge "Add dexdiag_test"
am: 05a252b52b

Change-Id: I49254e3736814b752d80b6d462d5ab192014f28c