Merge "Fix rounded rect drawing code for CardViews on pre JB devices." into mnc-ub-dev