Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am: 026b3d4604

Change-Id: I29c37db9569cdf2c8f080b003f4070c562bd8963