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

Change-Id: I1208eff18de7d2a7989ee8d1b432b0549f8749db