Merge "stagefright: fix log spam" into oc-dev