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

Change-Id: I6b7b1e04b00835ad2fde2d6d6b4b0dd6f3f81425