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

Change-Id: Ie1c4ee3e50e804c41daf95ec8c65aa001ad4ffc0