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

Change-Id: I6e980ad5cb4c77bcfdd9fff774d63838c9d86c50