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

Change-Id: I5a3419591bde7524aafa674a8533a4a8430635ac