am 6c6dc760: am 62c1a46e: Merge "Add ability to test supported content types...
am 6c6dc760: am 62c1a46e: Merge "Add ability to test supported content types to MediaDrm" into klp-dev
* commit '6c6dc760':
Add ability to test supported content types to MediaDrm