am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29

Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'

* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
  Add new binder methods to camera client to support generic callbacks