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