Bug: 265234582 Bug: 217181322 Test: make libwvdrmengine Change-Id: I6256f60ab871184298c1bfc44632c501a2db018c