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

Change-Id: Id96e4b6a3272f2f320b898c42e4970e4bbb2adb9