Merge "Add measurement of Dex code bytes and number of unique code items"
am: ad70b322fe

Change-Id: I82ddda00bd7b74e157d531bf1bac2fee83489647