Use our frameworks/base and Settings

Change-Id: Ie53c768c1b8e6e71dfa37a26a24270327bd273c5
S not s

Change-Id: I281bf759363ad21e8086377f15a8e9ff9947966f