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

Change-Id: I9526932252187255ecd6ceed094411660ebc20d9