Merge "AndroidKernel: Explicitly mark certain targets as phony"