Merge "Remove unneeded PRODUCT_RUNTIMES."