Merge "enum operator<<() script fails with do { } while cond;"
am: 92ca333976

* commit '92ca333976cf381de004945f95fa1e347d0a3a0e':
  enum operator<<() script fails with do { } while cond;