Merge "Move Browser2 to /product" am: 230d4d1a9f am: 4a95b1214c
am: f80442a6a3

Change-Id: Ib5c241b3951a5e01b386039240f84d8fd7a4f5db