Merge "Add explicit values to ABI enums in libs/hwui"