Merge "Merge \"Merge \\"Remove BrowserBenchTest\\" into lollipop-cts-dev am: 5fcf887ff1\" into lollipop-mr1-cts-dev am: 2da4fa1649" into marshmallow-cts-dev