Merge "Revert "HTMLViewer: allow encoding to be specified in incoming Intent.""