Merge "inferno: add --system_wide option." am: 30e7a431c0
am: b0a5e46f46

Change-Id: I35ae28b289e200141f2c82f2bc06dc69cbe8e573