Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"