Merge "Simplify the 137-cfi test."
am: 3e41a539d3

Change-Id: I6a50775b29bbbdf4ce01868953888a74fcdc4e3f