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