am 620b1faf: Merge "Fix the touch calibration bug" into ics-mr1

* commit '620b1faf126d4b5f7cb5c353cebd374d1347fdd4':
  Fix the touch calibration bug