am 44f9f23e: merge from open-source master

Merge commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7'

* commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7':
  Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode (KEYCODE_MEDIA_PREVIOUS)
tree: c2eaeb0c8335b80bef550cf9d672514eb02e389e
  1. mid/
  2. phone/
  3. PolicyConfig.mk