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

Change-Id: Ic4ee82a22a3b3167b0a43f20965fb452ce667fc3