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

Change-Id: I4ea91c552a351f493ee7199798c8d32151d1fcdb