Merge "add a specialized test type for libcore CTS" am: 739ac82858 am: d5476e9ac2 am: 2a9728d0ef
am: ab680be423

Change-Id: Id42ffa1d87cbc72cb3c930f06b0e28913611ace6