Merge "Doc Change: Docs for NDK r4." into froyo