Merge "Enable loading of treble-based plugins"

diff --cc drm/1.0/default/CryptoFactory.cpp
index e46233d,37471ba..13cad67
--- 1/drm/1.0/default/CryptoFactory.cpp
--- 2/drm/1.0/default/CryptoFactory.cpp
+++ b/drm/1.0/default/CryptoFactory.cpp
@@@ -13,8 -13,9 +13,10 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 +#define LOG_TAG "android.hardware.drm@1.0-impl"
  
+ #include <utils/Log.h>
+ 
  #include "CryptoFactory.h"
  #include "CryptoPlugin.h"
  #include "TypeConvert.h"

diff --cc drm/1.0/default/DrmFactory.cpp
index b6f642f,a72c9cc..d7a7c6d
--- 1/drm/1.0/default/DrmFactory.cpp
--- 2/drm/1.0/default/DrmFactory.cpp
+++ b/drm/1.0/default/DrmFactory.cpp
@@@ -13,8 -13,9 +13,10 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 +#define LOG_TAG "android.hardware.drm@1.0-impl"
  
+ #include <utils/Log.h>
+ 
  #include "DrmFactory.h"
  #include "DrmPlugin.h"
  #include "TypeConvert.h"