Merge "stagefright: move asString to android namespace" into nyc-dev