Merge "Remove __overloadable/__RENAME_CLANG"
am: 4362da8076

Change-Id: I8035439bd15876a5a8d5ded547e25760328affee