Fix build with latest AOSP.

Obviously this isn't pretty and needs to be addressed...