apexq: match firmware to kernel

Change-Id: I97e739dcabfd4ac3e0ab417928b4fdb63316c28a
Merge "apexq: match firmware to kernel" into android-4.4