Revert "Merge branch 'nightlies-4.3-JSS' of https://github.com/labodj/mako-linaro into f96p-JSS"

This reverts commit 6121de1df9029fe68db73773d01c7844c70a7a3b, reversing
changes made to d7902e396c50aafe1868a7658aeee970ec480bf9.