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

Change-Id: Ie28a563594711441e2f163023e6b9a311eca508a