am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"

* commit '62632e25f57989d5e5ac406e21f037a3e2f39b9c':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap