Merge "use new GKI kernel location" am: 1d83969db8

Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: I9c5af9cf064f3672e51736f2194b834162f3d993