Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev