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

* commit '9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
  docs: fixing ndk bug 5991108