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

Change-Id: I8a03ee3d3029a844d61cd0fb96a54b940e328ccf