Merge "Replace use of ro.monkey with ro.test_harness." into honeycomb