Merge "Revert "Revert "Refactor writing type lookup tables into OAT"""