Compiler Fix for new Aosp.

Compiler Fix for new Aosp

Change-Id: I9fc53b52afc890b76a328702882262608a02c16a