update
Merge branch 'jb-mr1' of github.com:erikcas/frameworks_av into jb-mr1