am 99314f43: Merge "Fix old style edit text drawable display error."

* commit '99314f432e024720ffb88431ca8535cec5e4ff58':
  Fix old style edit text drawable display error.