am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread

Merge commit '48ac68e1b117b6b55f06daced7d9d5d550853306' into gingerbread-plus-aosp

* commit '48ac68e1b117b6b55f06daced7d9d5d550853306':
  Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.