[automerger skipped] Fix compile error for clang update. am: 38f5f676c7 -s ours

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

Change-Id: If0b2e3b7b4144ab701e48f35c65e36fef9316979