Merge "Re-apply ndk-docs rule." am: cf2da22a2a am: 4adab14288
am: 97f9bef929

Change-Id: Idb98ee33ad258838982413d5a659a09ac4f24448