Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev
am: fcfe9d8418

Change-Id: Ida4184144880ef5c3f6a5522231b0a3edc31a4e4