Add support for DSA and ECDSA key types

Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b
Merge "Add support for DSA and ECDSA key types"
am bd5015e0: Merge "Add support for DSA and ECDSA key types"

* commit 'bd5015e0f3b79d8b8e7f9b1926bbf76985ac8c61':
  Add support for DSA and ECDSA key types
am 2541a0a8: Add support for DSA and ECDSA key types

* commit '2541a0a8f7a2c86658d435efb49843a88b4d97e0':
  Add support for DSA and ECDSA key types
am c124b23f: keymaster: use new version fields in hw_module

* commit 'c124b23f94a0a88e872253720c0e27594a9a9938':
  keymaster: use new version fields in hw_module
am 51dbad3b: Merge "hardware: camera_common: add module vendor tag ops" into klp-dev

* commit '51dbad3bfa313a4ba9219e3d9c4b3c1b2a15d52f':
  hardware: camera_common: add module vendor tag ops
am eb485256: Merge "Camera2 Tests: Fix stream id types" into klp-dev

* commit 'eb485256e99e97653773024951568aadcc60f6a4':
  Camera2 Tests: Fix stream id types
keymaster: use new version fields in hw_module

The original version of this HAL used a field in keymaster_module to
represent the module's version number, but a later revision of the HAL
interface added a distinguisher between HAL module and device versions.
This is needed to support upgrade code in keystore.

(cherry picked from commit c124b23f94a0a88e872253720c0e27594a9a9938)

Bug: 10600582
Change-Id: Ia2b0cbeca5c507600228c39ec7a8402f819f8804
Merge "keymaster: use new version fields in hw_module"
am 6a09617e: Merge "keymaster: use new version fields in hw_module"

* commit '6a09617eaa2e47e768b87c341459bf80e008a359':
  keymaster: use new version fields in hw_module
am fe46e6a9: libhardware: add Consumer IR HAL API

* commit 'fe46e6a90675fc637a1482e8dfeb27e374b7600d':
  libhardware: add Consumer IR HAL API
am 09875a2e: modules: add demo consumer IR HAL

* commit '09875a2eabe6bc6582b40ab8f1cc9eac9c3901d5':
  modules: add demo consumer IR HAL
am 22b42bc5: Merge "Clarify return values of get_presentation_position" into klp-dev

* commit '22b42bc528c1a38176572c128323e945ea4a7d0a':
  Clarify return values of get_presentation_position
am c900b423: Merge "consumerir: make transmit array constant" into klp-dev

* commit 'c900b4230c5f33abc1b7bc590c4ffe21ec8a59d0':
  consumerir: make transmit array constant
Use canonical UniquePtr.h header

Change-Id: I0487bd53fc946e1a488d7109eebd402d1ecc5a0a
Merge "Use canonical UniquePtr.h header"
am 1d640f05: Merge "Use canonical UniquePtr.h header"

* commit '1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
  Use canonical UniquePtr.h header
am d9d105a0: consumer_ir: add array length to get carrier freq

* commit 'd9d105a0ce6bbaa8d1d1cf70a255612a5dd33701':
  consumer_ir: add array length to get carrier freq
am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev

* commit '2a512b49e028b5714782ab69cba9662e01e25016':
  Camera2 Test: check the right result metadata
am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev

* commit 'cd996be7791b3f78e925532d5820da06d58cf635':
  Initial interface for MemoryTrackerHAL