Merge "add screencap to PRODUCT_PACKAGES"