Merge tag 'v4.9.11' into android-4.9-aosp

This is the 4.9.11 stable release