am 1381d4b5: media/playerservice: add getCodecList() to MediaPlayerService

* commit '1381d4b5c0385aec3741073e5998773b064c1fb0':
  media/playerservice: add getCodecList() to MediaPlayerService
am 229d2426: stagefright: support flexible YUV format

* commit '229d242665c612fd97431d1e7ac004823b47f181':
  stagefright: support flexible YUV format
am 0afbc2c3: Merge "delay data source creation for GenericSource prepare time" into lmp-dev

* commit '0afbc2c3a7769b31cbd1de931b65c4ab95fdf5a5':
  delay data source creation for GenericSource prepare time
libstagefright_foundation: fix build

Change-Id: If61766efa8834df175bd5758c760344364458d4a
am 1198a339: libstagefright_foundation: fix build

* commit '1198a3394a21d3c31b19395b124c77f09a8f0924':
  libstagefright_foundation: fix build
delay data source creation for GenericSource prepare time

Bug: 16708180

Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '9ee1572f7f01797b7526de95cb322f90c9b626bd':
  Fix PIC relocations for non-Bsymbolic builds
am 4b599537: am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '4b59953778bb49d0b316ad8f83991d5f6fb02fba':
  Fix PIC relocations for non-Bsymbolic builds
Fix PIC relocations for non-Bsymbolic builds

The ARM assembly contains a couple of hand-coded PC relative references
to data defined in other object files. Make sure the externs are tagged
as hidden so the linker knows that it can resolve the reference locally
at build time.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Bug: 16853291
Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47
(cherry picked from commit 97e3e847179c17eb9059fb322413b6facd3e5a03)
Fix the build after -Bsymbolic fix.

Bug: 16853291
Change-Id: Idc9808f76e8be7afb70513c4036b57c91690728e
(cherry picked from commit 8173554d5b5e25215e9c591a0dbb92b8c0ff082e)
AAC decoder: add support for controlling presentation parameters

Control the dowmixing of the AAC decoder
Control the DRC processing of the AAC decoder

Bug 16740915

Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297
Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev
am 317bb916: Merge "Clarify and implement MediaCodec status codes" into lmp-dev

* commit '317bb9163befccd87348c11bdfc0044e629b362b':
  Clarify and implement MediaCodec status codes
am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""

* commit '5a192121e99a740dab6df2b6550e02ef18f5dbc7':
  Revert "Fix build after side-stepping global -Bsymbolic."
Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aosp

Change-Id: Ib3877bfb60774d056fa2d934d2f4cb74e3b235ea
libstagefright: foundation: Add syntactic sugar to the cast.

Change-Id: I0b6b3ae440addd4891c26b0639bd6e647a7b031e
Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp-dev
am 0912a573: Merge "Fix effect and mono sink handling." into lmp-dev

* commit '0912a5738d6baf2df7cd62e877240e3807b4b21f':
  Fix effect and mono sink handling.
am 15ff76c9: Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp-dev

* commit '15ff76c99482eab01934cf0f55c815a85cf06f35':
  libstagefright: foundation: Add syntactic sugar to the cast.
Merge "some clean up of video size change notification" into lmp-dev