Fix build error

Change-Id: I2f87b6818dc1df6ce18e1c0c32d2a2ac5eeddadf

Conflicts:
	media/libstagefright/Android.mk