Merge "Fix runtest local.prop handling."