Merge "Create more shortcut phony targets" am: 44303e9f26 am: dc56268641
am: 1a276819a1

Change-Id: Ifaeb152d2fa108ed64fa4652841d4c13c1d9f5fe