Additional merges from cdm master

* Update unit test make files to use BoringSSL

  [ Merge of http://go/wvgerrit/14173 ]

  This CL updates the android makefiles to use the libcrypto_static.

* Do Not Run Provisioning Tests On Devices Without Keyboxes

  [ Merge of http://go/wvgerrit/15633 ]

  The provisioning tests outside OEMCrypto were failing on devices that
  use baked-in certificates because only OEMCrypto knows that the cert
  is baked in and the device cannot be reprovisioned. This change
  skips those two tests if the device says it does not implement
  rewrapping the cert. (i.e. it does not implement provisioning)

  Bug: 23554998

* Add new third-party libs (protobuf & gyp)

  [ Merge of http://go/wvgerrit/14717 ]

  The CE CDM used to expect these to be installed system-wide, which
  creates challenges for integrators who must cross-compile the CDM.

  These are now used in source form from third_party.

Change-Id: I29cca2f9415fe2fafdf948273e5a0f5d7de50285

libwvdrmengine/cdm/include/timer.h

@@ -2,8 +2,8 @@
 //
 // Timer - Platform independent interface for a Timer class
 //
-#ifndef CDM_BASE_CORE_TIMER_H_
-#define CDM_BASE_CORE_TIMER_H_
+#ifndef CDM_BASE_TIMER_H_
+#define CDM_BASE_TIMER_H_
 
 #include "wv_cdm_types.h"
 
@@ -48,4 +48,4 @@ class Timer {
 
 }  // namespace wvcdm
 
-#endif  // CDM_BASE_CORE_TIMER_H_
+#endif  // CDM_BASE_TIMER_H_