Merge "Move Browser2 to /product"
am: 230d4d1a9f

Change-Id: Id1978f5a9c5ef920688c5b3245d3881759de1762