stagefright: More custodial engineering

Change-Id: I2c7c49da5e01a8e9806a26727a09f0ea74875fd3