Merge "Factor out keystore and cert/pk8 extraction into util class" am: 6a9a5f2e47
am: e454aba7d7

Change-Id: I23e0f159c9372000690a381f4dc7c6aa50817985