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

Change-Id: I66974b15354d7c13c8049de61d66e7980804fc65