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

Change-Id: I51e7361a5d285a18b9eb228c1d0775f2e1274ab2