Merge "Add ResTable_sparseTypeEntry support"