Merge "Add a dist goal for the NDK." am: e5d1926c61 am: 55c6b82091
am: 27d694bee2

Change-Id: I5bf8d2db587ee4827ac1e14b14812da28fee3e1e