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

Change-Id: If7e2512f3748e361f9f112f5f370cb5673877752