Merge "Correct tags on StaticSharedLibraryProperties.Cflags" am: c6fa3eca am: 25edbe5d am: 773c4098 am: 5e769183 Change-Id: I75f8847d5466b1e30089d908e309fb878d42641b