Merge "Fix warnings in system/extras."
am: 4eb09a62f2

* commit '4eb09a62f2fc5f29747afd199dd1072d949b4892':
  Fix warnings in system/extras.