Changes generated with clang-modernize. Additionally, fixed some struct-vs-class usage to make clang happy. Change-Id: Ic6ef2427401ff1e794d26f21f7b44868fc75fb72
Bug #9193833 Change-Id: I4ee07e65c0a8967f0b55da030ecaad6dfc46136f