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

Conflicts:

	include/hardware/keymaster.h
	tests/keymaster/keymaster_test.cpp
fix mismerge
Support RGB565 FB device

Add HWC_DISPLAY_FORMAT for HWC::queryDisplayProperties() to
get the FB Device's format

Change-Id: Ic55d084f9243b95f54eb60dbef2fa52dcfb3a447
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
usbaudio: Fix output device routing

Fix issue with commit a35e783 causing the output device to reset back
to the hard coded value of CARD_ID after a new output device is
specified.

This happens because out_set_parameters() receives a single "routing"
key/value pair just after setting a new output device. The if/else
statement would then cause a reset of the output device back to CARD_ID
because the "routing" message does not contain a card or device id.

Change-Id: Ib7c7eb7ef675ae371033a7ae7ce73782cac2c898