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

Change-Id: Ifab3c9106f323b1e5e1d12a9b0f50dc00aeb3a88