Merge tag 'v4.4.49' into android-4.4.y

This is the 4.4.49 stable release