Merge "Revert "Update headers after adding RS_TYPE_FLOAT_16 and helpers""