Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: c9df3a1ff1
am: df9065fb09

Change-Id: Id8589172533fbc890179a7b4cde6a4b2c7f5258e