Merge changes I6c1af92f,Icf594d40 into rvc-dev-plus-aosp

* changes:
  Fix typo in NNAPI documentation
  Fix stale NNAPI documentation