frameworks/av removed -- our commits pulled into mainline