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

Change-Id: I00efaaa8aeb84833ed34ceaab6039c1c30c51203