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

Change-Id: I5641b515ca3c0826b2bca34b1b3dde0bd42d5c09