Run test build: Inline variables

Remove the upper-case variables by inlining their values.

Rename the first argument from 'ctx' to idiomatic 'self'.

Test: Generated artifacts are identical
Change-Id: I6081e828db03423c088e5685812325c5ed96fb00
2 files changed