am 7c13ed2a: am 1dd067d9: am 54709cb2: am bf11852a: merge from open-source master

Merge commit '7c13ed2afba1abe63f39b0f563978e04e849ae00' into dalvik-dev

* commit '7c13ed2afba1abe63f39b0f563978e04e849ae00':
  Fix for use of UNPREDICTABLE register combination