am c58abb6a: Merge "Rename modules NativeActivity"

* commit 'c58abb6aa3dfcb526215f307b29688f5e17753b2':
  Rename modules NativeActivity