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

Change-Id: Ief52b7567bbaa44438dd486765af0e042b43744e