Merge change 24391 into eclair

* changes:
  RIO-7461: Update media scanner to scan AAC files. (Change in frameworks/base git)