Merge changes Id23aa4ec,Ieb6c8b51

* changes:
  Format the world (or just HWUI)
  Add .clang-format file