Merge "Create more shortcut phony targets"
am: 44303e9f26

Change-Id: I0b42e1f01e7a0eb1b731459c581155b952e67a19