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

Change-Id: Iad1c725c5648278f7b06bdb2fb5d00ccd8e03ff1