Merge "Doc change: adjustments for ndk feature description" into froyo