am 374ad789: Merge change 24577 into eclair

Merge commit '374ad789df7e8376ccc7cdfac9e4414547550c53' into eclair-plus-aosp

* commit '374ad789df7e8376ccc7cdfac9e4414547550c53':
  Update peephole optimizer