Merge 94709049 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline

Tiny merge resolutions along the way to 5.8-rc1.

Change-Id: I24b3cca28ed36f32c92b6374dae5d7f006d3bced
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>