Merge "Clean up compiler warnings in signapk."