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

Change-Id: Ic33ee46b73f6f56646ad8a6b69fef023e510cad0