Merge "Mark default.supp as ETC instead of SHARED_LIBRARY" am: 24905f154e
am: 319fd422c0

Change-Id: I565f8e3cde5e1810c9d678772564c9e7897e7082