Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am: 1a323e5268

Change-Id: I90dee38cddaa1becbcc7dcfe91d7ecd09e22dcdd