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