Updated sources, fixed PRODUCT_DEVICE