Refactor function signature and move mock back

Test: atest librkp_factory_extraction_test
Change-Id: I907bf70d20829e90dd413050817dddc97ae53bf5
2 files changed