am 2ce5444d: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2ce5444d638e9504521e155ffdbb363f88cdc534':