Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: c6021960a4
am: 735fef090d

Change-Id: Ifac56a2c624409f602a84042d3575ea218fce4c4