Merge "Add rollback resistance support to keymaster impl."
am: 26b3eac654

Change-Id: I595041aafc700a6881684c5e81cf54415fe6e95d