Merge "Revert "frameworks/base: libexpat now exports its headers.""