Snap for 4429331 from f36ef0a5ca5f9c3546a58e053a4fc45aa3b39efe to sdk-release

Change-Id: I18697d0fcfb597fe7cb39f944f90fb801f8bb776
tree: dd3612797ac08fc7ac12e2ab2b9cff5a8f0be9a7
  1. DRM/
  2. libmediaparser/
  3. Android.mk