Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: 2f3380574e
am: 14aaf9732d

Change-Id: Ieb195dcbe0a4bc7842358f8ad1dcba20f5be5470