Revert "Squash revert of 3 commits that were breaking build."

This reverts commit debf5d93d89c9c487ca4da035bf07f511f862008.

should be good now that we track our own fw_rs, which doesn't use the PLD macro

Change-Id: Ifae65895278eb04097b4d39eea6e6f7abd8b0030