Merge tag 'v3.4.98' into linaro_android_4.4.4

This is the 3.4.98 stable release