Merge \"Pass the right class loader when inlining.\"
am: 4c4d6f42cf

Change-Id: I8568aff8cf2323e43e0d15441827ded3edd417e1