Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp * commit '16b72bbbc985cba7c59f52bf6969b4015f185830': RIO-7461: Update media scanner to scan AAC files.
Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp * commit '16b72bbbc985cba7c59f52bf6969b4015f185830': RIO-7461: Update media scanner to scan AAC files.