Revert "Track our own Frameworks/rs."

This reverts commit 112a5c196e7e751c3954381029f88a4ea6557a9e.

Change-Id: I0a6b67d45388e6dd2232a0d9c2234e3994973417
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
Return to CM LockClock

They reverted the Google services breaker, so it builds fine again

This reverts commit 167613de9884f4b3b19d0c1acd3ec88a789e31c2.

Change-Id: I891fda73bd18161bfc22835367688778f0e1c4d9
Merge branch 'kk' of https://github.com/CarbonDev/android into kk