Merge "Upgrade keymaster from 3.0 to 4.0"
am: 6d643f1b8c

Change-Id: I0fc536efc22595c175420836f9f947181d82e8c4