Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"