am 4a797b5a: Merge "Fix Paint#measureText Tests" into gingerbread

* commit '4a797b5a99e09b51961b95601b721fcd01634e43':
  Fix Paint#measureText Tests