Merge "Added android.test.mock to PRODUCT_PACKAGES"