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

Change-Id: I9f38fe070ad80e2e11469b133b1b24a986c0aa7d