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

Change-Id: I20f16a26e566eaf55d11be09b8050e0185cf8f81