Revert "Revert "Track our own Frameworks/rs.""

This reverts commit 0dab0ada530a9f5c925c61a7df7c124088d45c18.

too late, i already made some changes in bionic that need this.

Change-Id: I506980ab215bc123b14a2c9b108f86a08735737e