am c1c82509: Merge change 2163 into donut

Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'

* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
tree: b07791052009a5ae3502317f85d8d8748016749a
  1. include/
  2. media/