ecbfb2104f
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 9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing changes made to 019fe73ddbf52edd1819e1d85a0b242ebccc7fc3. Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0