Merge "Fix dimension of TypeInfo.dexType results" am: 5e9068dbec am: 11dd5d66de
am: 6c8941c13b

Change-Id: I1dd495c8e1a67b392da7116a7b48682450976f96