Merge "Change behavior of $noinline$ to now force not inlining." am: e92ba687f9
am: a5d64ee16a

Change-Id: I056f4844daf47badff2f30856fd351c506be2b7a