Update script for latest frameworks/av patch

Fixed conflicts due latest upstream changes.