Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287 am: d4b193c30c
am: 22b8317a49

Change-Id: I55b5522eb98b5db4c8599202361ab9595a38d461