- Support streaming of content without .wvm extension.

If the .wvm extension is not present, the file header
  is parsed to determine if it is Widevine content.
- Fixed a missing call to OpenSession.
- Fixed unit test build.
- Fixed x86-eng build.
- This is cherry-picked from master to hc-mr1 branch
  "DO NOT MERGE"
Change-Id: Ied0579325d3c11a91f6f182fe59cd978eca68368

proprietary/drmwvmplugin/test/Android.mk

@@ -8,10 +8,11 @@ LOCAL_SRC_FILES:= \
 LOCAL_C_INCLUDES+= \
     bionic \
     vendor/widevine/proprietary/include \
+    vendor/widevine/proprietary/drmwvmplugin/include \
+    vendor/widevine/proprietary/streamcontrol/include \
     external/stlport/stlport \
     frameworks/base/drm/libdrmframework/include \
-    frameworks/base/drm/libdrmframework/plugins/common/include \
-    frameworks/base/drm/libdrmframework/plugins/widevine/include
+    frameworks/base/drm/libdrmframework/plugins/common/include
 
 LOCAL_SHARED_LIBRARIES := \
     libstlport            \