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

Change-Id: I119973572afc1f04ad0396cbac608f09a5458c14