compilation fix on new Aosp

compilation fix on new Aosp

Change-Id: I257341f24eb277f4837d44457ee6e8fe85a7ae9c