frameworks/av patches merged into master