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

* commit '1b0f797a7274737468be7259ed9fde448b54af14':
  Fix warnings in system/extras.