Revert "Tiny optimization for complier templates for arm."

This reverts commit a435839f27ec80913f7d3c5691b61f0097f85e9d.
patch here to remove workaround in activity manager

Change-Id: Id88d9ed5b9f5de3ff7ec7f28fdecf2f2daf40ec4