Merge "CTS drawing pictures through HWUI for b/21945972" into mnc-dev