Merge "Fix SSA liveness analysis test." am: bff6bac661
am: 28f0d9f416

Change-Id: I7e8c9137926e1ce567a126293535e9325862235f