Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair