Merge \\"Number of unique strings loaded from dex code added to oatdump\\" am: 12e6e9f3f1
am: 342ab5c560

Change-Id: I701a6e5251790c41a04ea36b4b7daddbddaf5271