Merge "Revert "use new GKI kernel location"" am: f07902e84f

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

Change-Id: I7a60291d250bfd1b797036c9eb20c2e04dba9b21