Cleanup 4.4 merge of frameworks/base so jars build without error.

Change-Id: I77bbf2c7fbfe813f46661950ae06849310ed8b8a