Merge "Minor corrections to the Keymaster4 documentation." into pi-dev
am: 8bac8dcba5

Change-Id: I250acc092c7f63239884b84c2c8f8bb28261b927