Merge "Add frameworks base config and move text blobs there" am: 34cf8b2c04 am: 0dae24ff44 am: d1012721c4
am: 3f0be7e775

Change-Id: I9e14a4ab6df25ef2aefb34459472762243e9b6f1