d2:compile errors with new wakelock code

Change-Id: Ia04eaa1fcdb7828eb50aac0b6e6aaeed5f577c67