Merge "Revert "Generate the NDK docs with the ndk-docs target."" am: b33250278b am: 9f92348ffa
am: b2692a768a

Change-Id: Ice5624e4479367acfe26a02b43d66a981f2a23fc