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

Change-Id: If4040e7c1ddefb54c3e4b72c1060e10bb840661d