Merge "Add the new Stagefright ANativeWindow OMX codec API."