Merge "Account for `LOCAL_NDK_VERSION` when packaging." am: a1374de305
am: 43c41aea18

Change-Id: Ib67b829f3989ba353d4031dca89ba90e792a73ca