Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair