We don't need to merge packages/apps/Settings because we ain't no stinkin pandabord, yo

Change-Id: I4748e7e72e0bab9b00d8413e8ebfdc3ae615b32b