Merge "Switch Android Keystore sample code to new API." into mnc-dev