Merge "Track our own hardware/ti/wlan & hardware/ti/wpan" into android-4.4