Revert "Remove SYSTEM_ROOT_IMAGE := false" Bug: 139107810 Change-Id: I38f0a0fa78a7bbaf4669c962f7c77731c9fbb89c