[automerger skipped] Fix compile error for clang update. am: 38f5f676c7 -s ours am: 70d7b3175e -s ours am: e6a15b1b9b -s ours am: 5004cdbce5 -s ours am: 93dca4a785 -s ours

am skip reason: Change-Id I85972a6f042933540a371686e1a1d2bf422519af with SHA-1 38f5f676c7 is in history

Change-Id: I5e58f5b4031b8acac73df446225ad8c5b500a658