am 07ced01f: am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '07ced01f0420ec0d70b1dd38e41e9b3b121fffb0':
  docs: fixing ndk bug 5991108