Merge branch 'linux-mainline' into android-mainline-tmp

Change-Id: I4380c68c3474026a42ffa9f95c525f9a563ba7a3