Merge branch 'aosp-4.4', remote-tracking branch 'origin/aosp-4.4' into aosp-4.4