Merge \"trusty: Add nvram-wipe utility.\"
am: bcd37e67db

Change-Id: I25674145031ecb1eaac727581437989fc72d9d67