Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386
am: 53507c3423

Change-Id: Iaa8be1cd02acfb8b271179aba0a2ceef2cd87e56