Merge "Use type lookup tables in compiler"
am: e38f0320df

Change-Id: I15abc8dd3dd125cc58a0db8805708fcf9f548411