259927efc5
Swallows the error NEED_KEY if it comes back from AddKey(), as this is expected behavior. (It means privacy mode is on and the key that was just added was the privacy certificate, ergo the real decryption key is still absent.) Note that this carefully does not squelch the notification that comes from NEED_KEY, which is still necessary in order for the app to make a second key request. Also streamlines a test case that I noticed was overcomplicated for what it did while poaching code from it for new test cases. Also removes a .gyp file that was erroneously being copied to the Android tree. Android does not use GYP. Bug: 10495563 Change-Id: Ife3ff0270a0d09dac1b0eb0d84bddffd811e1eef