Merge "Exclude cmd line from build info." am: 5619120afc am: 0318b45bbf

Change-Id: Ia9f55de4440c5e44bfcb8e66b0b58d84e084441a