Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.
This reverts commit 9ecd9437ed, reversing
changes made to 019fe73ddb.
Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0