Android 6.0.0 release 23
am 50278dab: Restore zoom controls in HTMLViewer

* commit '50278dabb69191ed8605164936081a1701256cdd':
  Restore zoom controls in HTMLViewer