Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: 2f3380574e am: 14aaf9732d
am: 9598ccbe30

Change-Id: I1d8a6637cfed88f76e809e63d379fd818a258dba