Merge "Fix test code that hardcodes the keystore. Necessary for the host build." into gingerbread