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

Change-Id: I5dfaf7f7e287aa00c35928852ee3461396861cfd