Clang build fix. Not sure why this is happening with gcc. Change-Id: Ic3e192e31ba8d1d78dab83a6af13e82d261e5938
Bug: 21118563 Change-Id: I13c6a44f61668be8b4c1fde8c84dcfebab84517c