am 2fa064d7: am 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

* commit '2fa064d7e209bc9d75ab86eb4b16db8a56dc299e':
  Link to magic constants used by AndroidKeyStore API.