am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1

* commit '12104d3734421ca9234c3c1933fa33c239329a48':