Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: c6021960 am: 735fef09 am: c423d7af Change-Id: Ibb8b2bbc1fa73c44313ec52e996a7f10de152029