[automerger skipped] Fix compile error for clang update. am: 38f5f676c7 am: 3f223c1ac1 am: add4ebe799 am: 2d0126b5a9 -s ours

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

Change-Id: Ie246174c3e07d03ca44da646c4cd41cdf5dfd237