Merge changes from topic "system-server-images" into sc-dev

* changes:
  Fix JNI error
  Revert^2 "Zygote: Load system server code early"