Merge "Use android::base::Basename instead of basename"