Merge "AArch64: Switch back to hwe-16.04 kernel" into stable/fraser