am fb4da1e7: Merge "Regenerate binder header"

* commit 'fb4da1e7b749b4cf6843515517e839efa1ee24c7':
  Regenerate binder header