Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev am: 83fbb94e18
am: ffa68753f8

Change-Id: If6e62fb5ce4de5037fb4e537cd537776d7ae5a01