Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17 am: 4552dd8a21 am: 562fabb016 am: 40ce3a4348

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

Change-Id: Ib5371825f26dc4cb8b61d6718473453084948899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>