am c4ca079b: am c58abb6a: Merge "Rename modules NativeActivity"

* commit 'c4ca079b038cf9f107eef0feadb944844cec9402':
  Rename modules NativeActivity