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

Change-Id: I5198b4fea7330c7ece4e9d449f7e600977442d24