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

This is the 4.9.10 stable release