Merge "Add VTS tests for drm+crypto HALs" into oc-dev am: ebf7f3213b
am: 6e0acf2891

Change-Id: Ib0643d67686834cd480abd3fb1638c0938898f03