Merge "Make ClearKeyDrmUnitTest build with the VNDK."