Run test build: Refactor compile commands

Test: All build artifacts are identical.
Change-Id: Ie8baa091a6b0041e2d86d21d48d29e8851fc29ad
2 files changed