Merge "Fix the last warnings in frameworks/av/ drm code." into nyc-dev
am: 1deb248c05

* commit '1deb248c059cb79d4e4f3d0e4a1ca59533a8046e':
  Fix the last warnings in frameworks/av/ drm code.