Merge "revamp app compat test harness" into oc-mr1-dev am: 41c78dbd9e
am: c50a4b06de

Change-Id: Ib93eddb696fccb26e65a30da22496d3127802622