Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: dcd3d3ae21 am: 139961c4de
am: eb292595b2

Change-Id: I4a89987200399841c548ecb39ab3792bab54da33