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

Change-Id: Ib29f7b2ea250ffaa3051c12ffa6fc9320dea151d