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

Change-Id: I5e3553439c67a7bf327c99e85c8abc573a8623c3