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

Change-Id: I0fd4ea8e598bf3dc5a8cf9c4bf749ba9b6043c99