Merge "Merge df45da57 ("Merge tag 'arm64-upstream' of...

Merge "Merge df45da57 ("Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux") into android-mainline" into android-mainline