am cf1e3bb2: Merge "Fix AAC recording issue"

* commit 'cf1e3bb24b88cf942c133248d26ee7bb57ed5ba7':
  Fix AAC recording issue