am 629e255d: am a39ce124: Merge "Revert "Revert "Enable optimizations with --debuggable."""

* commit '629e255df261818e9369fcd69bbde713dcb7560f':
  Revert "Revert "Enable optimizations with --debuggable.""