Prima: squashed set of reverts from CAF

https://www.codeaurora.org/cgit/quic/la/platform/vendor/qcom-opensource/wlan/prima/commit/?h=kk_3.5_rb1.19&id=4bb49fcc629123c1fa331dcdebe1079736baef93
https://www.codeaurora.org/cgit/quic/la/platform/vendor/qcom-opensource/wlan/prima/commit/?h=kk_3.5_rb1.19&id=9b1a2d81a655e646d37daff09c6af1157a512f3e

Change-Id: Icf4c45cf26760d06c1bd89bae1a29e8b1d922bc5