Merge changes I155f9f77,Ibb1aa07a into oc-dev-plus-aosp

* changes:
  Fix trivial warnings hidden by -isystem
  Fix non-trivial warnings hidden by -isystem