Merge "Remove (now) unused android_bcpkix source"
am: 257f899176

Change-Id: I82d58c9cb0cf2da48ac8b50326ff57eebae73b0b