Merge "Allow platforms and samples to be located under development/ndk/{platforms,samples}" into kraken