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

Change-Id: I090219a863cb3cf76afe8def150323ddb191d539