Use build tools version 18.1 for SeriesGuide modules.
(cherry picked from commit 792b3f5)
Use our own theme-dependant cancel drawable in TVDb add fragment.
Merge remote-tracking branch 'upstream/beta' into beta