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

Change-Id: I24fe13ee5a76530887655d08807c4fb9173bca8a