Merge "Make it possible to disable SYSTEM_ROOT_IMAGE feature" into master-cuttlefish-testing