warnings be gone.

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)

Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.

Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
Conflicts:
	media/libstagefright/ACodec.cpp
	media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp