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

Change-Id: I0154740ca03ad068563e604b34476cb56b14c52f