Merge "16k: Add 16K variant kernel/ramdisk build targets"