Merge "Instrument ARM generated code to check the Marking Register." am: 52b450bd92
am: 04a8d7b2e4

Change-Id: Ica5cc1dd40ae5f4c3e7d3406462a511720bcb8a5