Merge "Mark default.supp as ETC instead of SHARED_LIBRARY"