am 6e2d46fd: am 03a938bc: Merge "Fix -Xjitthreshold (for real this time)."

* commit '6e2d46fd7488331181502a878959336966ac3776':
  Fix -Xjitthreshold (for real this time).
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
Revert "Tiny optimization for complier templates for arm."

This reverts commit 87bc7988cdb4e61421a3e701e84f7070f603635d

No obvious problems with this change - but reverting to aid in tracking down bug:

8543495 NCs in Play Store : >>> com.android.vending

Change-Id: I8bd6dbe6a7b3a4650a5e857a5a529cde6569b987
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev
merge in jb-mr2-release history after reset to jb-mr2-dev