Revert "TARGET_BUILD_VARIANT=user"

This reverts commit 50c66bb946abae87d20882aa3a5114c0427f6776.