Merge "Add CleanSpec.mk entries for linux -> linux_glibc" am: 9ce6d963f2
am: 2e21024c86

Change-Id: Icff46b8a4076e2e502df92864a50b3434776187b