Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev