horn3t finally fixed PerformanceControl aapt localization errors

Change-Id: I054913169f18c88acae784d6a0b0159a53c1cd71
Revert "TEMP: Track my frameworks/base until vanir catches up"

This reverts commit e7c374cadd5810481be0d49ad7fd49ad7e820b32.