Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: 37e2a6912a am: 558660b90c
am: 75d89f248b

Change-Id: Ia636ef4e0402de6c4f8f28713196e022e8fdf24c