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

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