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

Change-Id: I4783fbf962023961afa5dbe6d762b72b746871cd