A recent merge accidentally removed the unit tests SimultaneousDecrypt* from oemcrypto_test. Also the unit test GetKeyDataNullPointer was disabled. This CL puts those tests back in. bug: 26892550 Change-Id: I9d8f0a38e65727231543248135366331a6f52b02