catch up to recent changes in falcon 8226-common and qcom-common

Change-Id: I1de8ad56d0964e7db1bc26c4788641efa0dde61a