Merge "Build libdrmdecrypt by linking against new wv static library." into jb-dev