Merge "Mark more phony targets as PHONY" am: 98b189fe7e
am: 2952266357

Change-Id: I8edbe7e2a2c3493009efb6fbcdc4057621842de6