Merge "Fix -Xint and -Xusejit interaction" into nyc-dev
am: ba20abc

* commit 'ba20abcd1bf567bac34b82794c3630a0ca81be3d':
  Fix -Xint and -Xusejit interaction

Change-Id: I5f78ca2eae24dde874621ef750e864a7e6da3681