am 1b34c1bc: Merge "stagefright: Remove useless declarations"
am 1b34c1bc: Merge "stagefright: Remove useless declarations"

* commit '1b34c1bc240e6c2e085eee2b03c728b56b049e23':
  stagefright: Remove useless declarations

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base