Fix ro.aicp.device naming

Change-Id: Ie02a3c23fdccbf1e443819f9a1c236a0d0525e40