add shortnames for skipping in global preparers

Bug: 27634753
Bug: 27531106
Change-Id: I3ee4ea1a05b86738df533b6449bb9fcfbbd3781e
2 files changed