Merge "Only honor $inline$ in AOT."
am: 9fb4e85d6e

Change-Id: I6462f5c172ba68042c56f60158200ad0bde3a3a8