am 7ff0d9a6: am 16b72bbb: Merge change 24391 into eclair

Merge commit '7ff0d9a60ab6af7025eb283d01158f0fd4736173'

* commit '7ff0d9a60ab6af7025eb283d01158f0fd4736173':
  RIO-7461: Update media scanner to scan AAC files.