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

Change-Id: Iee83e2be2f9b1b512ce239b5d50d4335955a9b59