Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: 0d699ab3d2
am: 8c248c60b2

Change-Id: I2b5127bc84d61900989b88be3cda4088b9d8d117