am 8c7ab034: Fixing the build, only instantiate the software aac decoder in...
am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '8c7ab034' into eclair-mr2-plus-aosp
* commit '8c7ab034':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.