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

Change-Id: I8bc2c7b314a18f2870f34a93683c1afba2540f4d