Merge "Add aftltool is a signing parameter" am: 2995096483 am: b91c3201a6 am: 9c4ded29f7

Change-Id: I42977adf8c25e177eb48180b3ceb3cd2d695ee5d