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

Change-Id: Id7569338871a622a20334b917ccd6dc1e1f3a336