keymaster_test: change keymaster API version to 3

Change-Id: I2786d46a94d3b2c3d4161dfd4e19b0960e893513
audio: Remove fatal errors which aren't really fatal

 * These are gonna cause mass chaos due to broken audio policy configs.

Change-Id: I5d91161ff5649a53bd3eea2d225353ca765729cf
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0