Merged from https://widevine-internal-review.googlesource.com/183778 In addition to the merge from oemcrypto-v17, this CL fixes a few header indents and v18 tag links. Merged from https://widevine-internal-review.googlesource.com/183782 Change-Id: I781aa69314acdeb48bff1af3c291c847f6a664ea