Merge "Add a way to override LOCAL_PRODUCT_MODULE."