Merge "stagefright: make more warnings errors"