Merge branch 'jb-release' of https://android.googlesource.com/platform/frameworks/av into aosp