Merge "Fix warnings hidden by -isystem" into oc-dev-plus-aosp