Merge changes I425638d3,Ie06232a0 into sc-dev

* changes:
  Revert "Migrate ApkAssets to use NativeAllocationRegistry"
  Revert "Cast ApkAssets to uintptr_t before jlong"