am 2109e680: am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.

Merge commit '2109e6801199b10460330027f3537d406b6a0149'

* commit '2109e6801199b10460330027f3537d406b6a0149':
  Fixing the build, only instantiate the software aac decoder in full stagefright builds.