Merge "Fix NDK modules." am: 766bcc63f8 am: 90bc60c06c am: 5d2a1d9b42
am: 192dd54bbd

Change-Id: Id52af6279d79b0c52bda81dea4ec019366a0ba6f