Merge "Update codelab system app to use native code" into main