am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev

* commit 'c1e989e76a461ea69e293839b3c29b634a462bd5':
  Zero out return values in media binder calls