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

Merge commit '8c7ab034692eea550b97bebd7746e1a82735bbbd' into eclair-mr2-plus-aosp

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