[automerger skipped] 16kb: Add aosp_caimito_16k targets am: eb617e005b -s ours

am skip reason: Merged-In I9ea2b41b0d6af8f86179f7e4007140181f06028a with SHA-1 644e60f4dc is already in history

Original change: https://android-review.googlesource.com/c/device/google/caimito/+/3395425

Change-Id: I358fc5aa4b410fd137e0543884556db752f98948
Signed-off-by: Automerger Merge Worker <[email protected]>