am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"

* commit 'ac1d40cf4fae70533a18205e4a6736b198aa8251':
  Fixed inconsistent minSdkVersion and target= in NDK samples