[automerger skipped] Fix compile error for clang update. am: 38f5f676c7 am: 3f223c1ac1 -s ours am: 0e9d542748 -s ours am: b5f6c3dcd0 -s ours am: 5a9534f6df -s ours

am skip reason: Change-Id I85972a6f042933540a371686e1a1d2bf422519af with SHA-1 0d0d97559b is in history

Change-Id: Ic814fabe75c7cc10b5f62eff3c8999ca3161731c