Merge "Downgrade generated test harness for NDK libc++" into oc-mr1-dev
am: 61e7b96aa2

Change-Id: Ia88c4e4c4c36ac0511f85e7580ee47ff04b8db49