Merge "Generate CFI for stackless methods." am: e39765cd31
am: 3484e41862

Change-Id: I647c60fa4f0d21d66ff6edf99e910c43a4959b01