Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev am: 812e87ecba
am: d32b6e012a

Change-Id: I596d43c935516141b9c834c0af7441606d41a33a