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

Change-Id: Iab296e5f8d7164d9b9484fed11d63b54fcb04b4f