am 06565c9d: am ad77ed7d: ndk: fix samples compilation

Merge commit '06565c9d35dbbc744bc6355dd418505855e7ce5e'

* commit '06565c9d35dbbc744bc6355dd418505855e7ce5e':
  ndk: fix samples compilation