Merge "trusty: Fix apploader short option" am: 06ac3e24fe

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffcc8f2ef11a7233bf2074ecabf0a21752e7ec84