Merge "Add xmlpool/options.h back in the list of intermediate prebuilt source files"
am: 5e0303ace0

Change-Id: I7c5670765bae5d54eebc168bf1d4bf781ed6ddbe