am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom

* commit '1afeea0f207f8b8b781f799f5d150b70495abb1a':
  work around a problem where fp registers get corrupted (DO NOT MERGE)