Merge "fastbootd: exporting CPU ABI info" am: afce590601
am: 3db881359d

Change-Id: Icd30b72705da669d9558437a9829aa3a32b68e91