am f2b90f17: am 55c3bd0c: Merge "stagefright: rename usePersistentInputSurface...
am f2b90f17: am 55c3bd0c: Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev
* commit 'f2b90f17':
stagefright: rename usePersistentInputSurface to setInputSurface