Merge "ART: Clean up primitive-type construction"
am: 2edafc553a

Change-Id: I00d231f3cb6576ba6c376b146a85de35125fe967