Merge "Don\'t pre-opt shims" into nyc-dev
am: 5add5bb77f

* commit '5add5bb77f4af3706d878651e2c1e2c45d463c86':
  Don't pre-opt shims

Change-Id: Icdb0f8c897ba571ee8c022d964c951c96e137783