Merge "disable -Wdeprecated-declarations in legacy code"