Merge "Modifying extraction tool to support P256." am: 1d08747a23 am: c7e6fcd2a4

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1964459

Change-Id: Ibe44c2ee099c31fe78e97280b8c8db742902a4b4