Merge tag 'v5.0' into android-mainline

Linux 5.0

Change-Id: Ia634eb0c2a754b12cd2485caea3314c78c295771