Merge "Refactor writing type lookup tables into OAT"