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

Change-Id: I51539c7ca826f4ff2fe654ce4aa9bf0b43155eff