Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev