am f5988cf0: Merge "Revert "Use optimizing for apps.""

* commit 'f5988cf0c47ff935bb19c89ed0398be5fbe44bb6':
  Revert "Use optimizing for apps."