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

Change-Id: I43f86cb0e33f08b9cdb2b7e50705bbfdb0b3d73d