Merge "Enable clang-format for input-related code" am: d052fe5b1c
am: 9a8c489388

Change-Id: I60d0bb605508340ef624532473bfd16e4bdc71a6