Migration from jb-mr2 to master for Widevine CDM

Android development of the widevine CDM has been done
on the jb-mr2 branch of the cdm code base.  This CL
contains a merge of that jb-mr2 work to CDM master, and
also reflects the evolution of the common Modular DRM
code base since jb-mr2 branched.

Change-Id: I1d7e1a12d092c00044a4298261146cb97808d4ef

libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp

@@ -16,7 +16,6 @@
 namespace wvoec_mock {
 
 bool KeyControlBlock::Validate() {
-
   valid_ = false;
   if (0x6b63746c != verification_) {  // kctl.
     LOGE("KCB: BAD verification string: %08X (not %08X)", verification_,
@@ -35,7 +34,6 @@ bool KeyControlBlock::Validate() {
       LOGW("KCB: CGMS setting set for refresh.");
     }
   }
-
   valid_ = true;
   return valid_;
 }